Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ENHANCEMENT/BUGFIX] Bopper sync and bpm change events #3903

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from

Conversation

MidyGamy
Copy link
Contributor

@MidyGamy MidyGamy commented Nov 28, 2024

This fixes the bopper desyncing from each other, imitating the if(curBeat % 2 == 0) dad.dance(); from the 0.3.X of the game, but calculate it automatically with the actual idle animation duration, using danceEvery as a well, making it consistent with the BPM and camera bopping.

For it to work, I also included onBpmChange() and the bpmChange SongTimeScriptEvent, called every time the bpm changes, allowing easier scripting instead of manually detecting it though beatHit if we use an .hxc script.

To do:
Find a way to handle the automation for a decimal danceEvery, currently ignored and works like before

@github-actions github-actions bot added size: large A large pull request with more than 100 changes. pr: haxe PR modifies game code. and removed size: large A large pull request with more than 100 changes. labels Nov 28, 2024
@MidyGamy
Copy link
Contributor Author

MidyGamy commented Nov 28, 2024

Btw, this is a rewrite of #3092, which was broken and unorganized

@MidyGamy MidyGamy changed the title Bopper sync and bpm change events [ENHANCEMENT/BUGFIX] Bopper sync and bpm change events Nov 28, 2024
@github-actions github-actions bot added size: large A large pull request with more than 100 changes. and removed size: large A large pull request with more than 100 changes. labels Nov 28, 2024
@MidyGamy
Copy link
Contributor Author

Ok I might found a solution, but maybe a better looking one could be found?
(P.S. I don't even understand why decimal danceEvery is even a thing...)

@MidyGamy MidyGamy marked this pull request as ready for review November 28, 2024 22:51
@AbnormalPoof
Copy link
Collaborator

(P.S. I don't even understand why decimal danceEvery is even a thing...)

#2925 (comment):

I will also change danceEvery so that it uses event.step % (danceEvery * STEPS_PER_BEAT) so it works with any multiple of 0.25

@MidyGamy
Copy link
Contributor Author

(P.S. I don't even understand why decimal danceEvery is even a thing...)

#2925 (comment):

I will also change danceEvery so that it uses event.step % (danceEvery * STEPS_PER_BEAT) so it works with any multiple of 0.25

Yeah... still confused...

@github-actions github-actions bot added size: large A large pull request with more than 100 changes. and removed size: large A large pull request with more than 100 changes. labels Dec 28, 2024
@EliteMasterEric EliteMasterEric added the status: pending triage Awaiting review. label Jan 17, 2025
@EliteMasterEric EliteMasterEric changed the base branch from main to develop January 17, 2025 01:07
@Hundrec Hundrec added type: enhancement Involves an enhancement or new feature. size: large A large pull request with more than 100 changes. labels Jan 22, 2025
@AbnormalPoof
Copy link
Collaborator

This PR appears to have merge conflicts. Please fix them!

@AbnormalPoof AbnormalPoof added status: needs revision Cannot be approved because it is awaiting some work by the contributor. and removed status: pending triage Awaiting review. labels Jan 22, 2025
@MidyGamy
Copy link
Contributor Author

Done

@AbnormalPoof AbnormalPoof added status: pending triage Awaiting review. status: needs revision Cannot be approved because it is awaiting some work by the contributor. and removed status: needs revision Cannot be approved because it is awaiting some work by the contributor. status: pending triage Awaiting review. labels Jan 27, 2025
@AbnormalPoof
Copy link
Collaborator

There appears to be extra commits from main methinks

@MidyGamy
Copy link
Contributor Author

I can see that, any way I can get rid of it?

@AbnormalPoof
Copy link
Collaborator

Do a rebase

@MidyGamy
Copy link
Contributor Author

alright, let me a minute

@MidyGamy MidyGamy changed the base branch from develop to main January 27, 2025 19:09
@Hundrec Hundrec added status: rejected Issue did not pass review or PR cannot be approved. and removed pr: haxe PR modifies game code. labels Jan 28, 2025
@MidyGamy MidyGamy reopened this Jan 28, 2025
@MidyGamy
Copy link
Contributor Author

YEPEE!!! I THINK I DID IT!!

@AbnormalPoof AbnormalPoof added type: enhancement Involves an enhancement or new feature. status: pending triage Awaiting review. size: large A large pull request with more than 100 changes. pr: haxe PR modifies game code. and removed status: rejected Issue did not pass review or PR cannot be approved. labels Jan 28, 2025
@MidyGamy MidyGamy marked this pull request as draft January 30, 2025 02:45
@MidyGamy MidyGamy marked this pull request as ready for review January 30, 2025 03:00
@AbnormalPoof
Copy link
Collaborator

Literally no idea why GitHub actions is acting this way... I've removed the labels it added.

@MidyGamy
Copy link
Contributor Author

MidyGamy commented Feb 7, 2025

A little showcase of the Bopper sync part!

https://www.youtube.com/watch?v=_yPna20aeLU

@Hundrec
Copy link
Collaborator

Hundrec commented Feb 7, 2025

Very cool showcase!

@MidyGamy
Copy link
Contributor Author

MidyGamy commented Feb 8, 2025

Now I'm wondering if I should give a frame more than the actual animation to prevent what we see with Monster... Should I?

@Hundrec
Copy link
Collaborator

Hundrec commented Feb 8, 2025

Yeah, I think I see Monster bopping a little funky at the beginning.

It'd be awesome if you could make his bopping more consistent!

@MidyGamy
Copy link
Contributor Author

MidyGamy commented Feb 8, 2025

Yeah, I think I see Monster bopping a little funky at the beginning.

It'd be awesome if you could make his bopping more consistent!

Or maybe we could keep it only for him? since he's crazy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr: haxe PR modifies game code. size: large A large pull request with more than 100 changes. status: pending triage Awaiting review. type: enhancement Involves an enhancement or new feature.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants